From fce37b137d7a926043eeb0c49410c0adf424e84c Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 20 Aug 2018 06:20:05 +0200
Subject: [PATCH] gdk: Make gdk_keyval_name() return a const char

The string is const, so return it like that.
---
 gdk/gdkkeys.c                   | 2 +-
 gdk/gdkkeys.h                   | 2 +-
 gtk/a11y/gtkaccessibilityutil.c | 2 +-
 gtk/gtkaccellabel.c             | 8 ++++----
 gtk/gtkshortcutlabel.c          | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index 3425c3b3f1..a60a33be3e 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -738,7 +738,7 @@ gdk_keymap_get_modifier_mask (GdkKeymap         *keymap,
  *     of the key, or %NULL if @keyval is not a valid key. The string
  *     should not be modified.
  */
-gchar *
+const gchar *
 gdk_keyval_name (guint keyval)
 {
   return _gdk_keyval_name (keyval);
diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 1c9093e807..5189bc54c7 100644
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -133,7 +133,7 @@ GdkModifierType gdk_keymap_get_modifier_mask       (GdkKeymap           *keymap,
 /* Key values
  */
 GDK_AVAILABLE_IN_ALL
-gchar*   gdk_keyval_name         (guint        keyval) G_GNUC_CONST;
+const char *gdk_keyval_name      (guint        keyval) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
 guint    gdk_keyval_from_name    (const gchar *keyval_name);
diff --git a/gtk/a11y/gtkaccessibilityutil.c b/gtk/a11y/gtkaccessibilityutil.c
index 1b840f80e1..beaae3a50e 100644
--- a/gtk/a11y/gtkaccessibilityutil.c
+++ b/gtk/a11y/gtkaccessibilityutil.c
@@ -131,7 +131,7 @@ atk_key_event_from_gdk_event_key (GdkEventKey       *key,
 
   event->state = state;
   event->keyval = keyval;
-  event->string = gdk_keyval_name (keyval);
+  event->string = (char *) gdk_keyval_name (keyval);
   event->length = strlen (event->string);
   event->keycode = keycode;
   event->timestamp = gdk_event_get_time ((GdkEvent *)key);
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 65c8b4b7f5..75ee16bc8c 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -574,10 +574,10 @@ find_accel (GtkAccelKey *key,
  * so no need to be UTF-8 safe.
  */
 static void
-append_without_underscores (GString *s,
-                            gchar   *str)
+append_without_underscores (GString    *s,
+                            const char *str)
 {
-  gchar *p;
+  const char *p;
 
   if (g_str_has_prefix (str, "XF86"))
     p = str + 4;
@@ -816,7 +816,7 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,
     }
   else if (!append_keyval_symbol (accelerator_key, gstring))
     {
-      gchar *tmp;
+      const char *tmp;
 
       tmp = gdk_keyval_name (gdk_keyval_to_lower (accelerator_key));
       if (tmp != NULL)
diff --git a/gtk/gtkshortcutlabel.c b/gtk/gtkshortcutlabel.c
index 55ca247589..be430d88dd 100644
--- a/gtk/gtkshortcutlabel.c
+++ b/gtk/gtkshortcutlabel.c
@@ -130,7 +130,7 @@ get_labels (guint key, GdkModifierType modifier, guint *n_mods)
   const gchar *labels[16];
   GList *freeme = NULL;
   gchar key_label[6];
-  gchar *tmp;
+  const gchar *tmp;
   gunichar ch;
   gint i = 0;
   gchar **retval;
-- 
2.30.2